From 84f45eac389eba4e2dd3bd915cd65454c43ed04a Mon Sep 17 00:00:00 2001
From: "iap10@tetris.cl.cam.ac.uk" <iap10@tetris.cl.cam.ac.uk>
Date: Thu, 25 Mar 2004 13:17:49 +0000
Subject: [PATCH] bitkeeper revision 1.825.2.2 (4062dbfdjYJh7FL2Kx-eM_Gi_X4N-w)

merge cleanup
---
 .rootkeys                          | 2 +-
 xen/common/kernel.c                | 2 +-
 xen/common/shadow.c                | 8 ++++----
 xen/include/{xeno => xen}/shadow.h | 8 ++++----
 4 files changed, 10 insertions(+), 10 deletions(-)
 rename xen/include/{xeno => xen}/shadow.h (98%)

diff --git a/.rootkeys b/.rootkeys
index b8b93e6cc9..e6eaf701f0 100644
--- a/.rootkeys
+++ b/.rootkeys
@@ -575,6 +575,7 @@
 40589969nPq3DMzv24RDb5LXE9brHw xen/include/xen/sched-if.h
 3ddb79c0LzqqS0LhAQ50ekgj4oGl7Q xen/include/xen/sched.h
 403a06a7H0hpHcKpAiDe5BPnaXWTlA xen/include/xen/serial.h
+405b8599BsDsDwKEJLS0XipaiQW3TA xen/include/xen/shadow.h
 3ddb79c0VDeD-Oft5eNfMneTU3D1dQ xen/include/xen/skbuff.h
 3ddb79c14dXIhP7C2ahnoD08K90G_w xen/include/xen/slab.h
 3ddb79c09xbS-xxfKxuV3JETIhBzmg xen/include/xen/smp.h
@@ -591,7 +592,6 @@
 3f055a3dwldYR102YcSuBaxIf9t3Jw xen/include/xen/vbd.h
 3e8827bdaqPeZAWGVOwswgY9bWSx4g xen/include/xen/version.h
 3ddb79c2Ae5KpzhC9LCYG7mP_Vi4Aw xen/include/xen/vif.h
-405b8599BsDsDwKEJLS0XipaiQW3TA xen/include/xeno/shadow.h
 3ddb79c4YQCQ6r0xNLLu0jfbM7pVmA xen/net/Makefile
 3ddb79c4AkfDkTCw0comx4L8wsUOMg xen/net/dev.c
 3ddb79c4x1L_soh8b-r_1jQW_37Icw xen/net/dev_mcast.c
diff --git a/xen/common/kernel.c b/xen/common/kernel.c
index 64ef966a3b..3122b80421 100644
--- a/xen/common/kernel.c
+++ b/xen/common/kernel.c
@@ -107,7 +107,7 @@ void cmain(unsigned long magic, multiboot_info_t *mbi)
     module_t *mod;
     void *heap_start;
     int i;
-    unsigned long frametable_pages, max_mem;
+    unsigned long max_mem;
 
     /* Parse the command-line options. */
     cmdline = (unsigned char *)(mbi->cmdline ? __va(mbi->cmdline) : NULL);
diff --git a/xen/common/shadow.c b/xen/common/shadow.c
index 03c5cb9a6a..29c7f9a8b9 100644
--- a/xen/common/shadow.c
+++ b/xen/common/shadow.c
@@ -1,9 +1,9 @@
 /* -*-  Mode:C; c-basic-offset:4; tab-width:4 -*- */
 
-#include <xeno/config.h>
-#include <xeno/types.h>
-#include <xeno/mm.h>
-#include <xeno/shadow.h>
+#include <xen/config.h>
+#include <xen/types.h>
+#include <xen/mm.h>
+#include <xen/shadow.h>
 #include <asm/domain_page.h>
 #include <asm/page.h>
 
diff --git a/xen/include/xeno/shadow.h b/xen/include/xen/shadow.h
similarity index 98%
rename from xen/include/xeno/shadow.h
rename to xen/include/xen/shadow.h
index 212a0dbfbb..3d3fa61166 100644
--- a/xen/include/xeno/shadow.h
+++ b/xen/include/xen/shadow.h
@@ -3,10 +3,10 @@
 #ifndef _XENO_SHADOW_H
 #define _XENO_SHADOW_H
 
-#include <xeno/config.h>
-#include <xeno/types.h>
-#include <xeno/mm.h>
-#include <xeno/perfc.h>
+#include <xen/config.h>
+#include <xen/types.h>
+#include <xen/mm.h>
+#include <xen/perfc.h>
 
 /* Shadow PT flag bits in pfn_info */
 #define PSH_shadowed	(1<<31) /* page has a shadow. PFN points to shadow */
-- 
2.30.2